Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'release/6.0.4xx' => 'main' #26796

Merged
merged 48 commits into from
Aug 3, 2022
Merged

Merge branch 'release/6.0.4xx' => 'main' #26796

merged 48 commits into from
Aug 3, 2022

Conversation

v-wuzhai
Copy link
Member

No description provided.

gkulin and others added 30 commits May 26, 2022 14:43
@gkulin
extra check before throwing exception and other changes + comments
928a56e
@gkulin
extra check before throwing exception and other changes + comments
4579019
@gkulin
wip
ba22ae7
@gkulin
extra check before throwing exception and other changes + comments
9767abc
@gkulin
extra check before throwing exception and other changes + comments
9555f2c
@gkulin
wip
2c4367b
@gkulin
wip
529d09b
@gkulin
wip - adding get url workaround
96a7117
@gkulin
resolve conflict
8cee8b6
@gkulin
Merge branch 'release/6.0.4xx' of https://github.com/dotnet/sdk into …
aad8828 
…printDownloadLinkWithPriorSdkVersions
@gkulin
take in Daniel's changes from #25829
f3002a3
@gkulin
fix some errors from the previous merge
9ecccdf
@gkulin
update typos
9e205c2
@gkulin
fix typos and add fallback for getting URLs
4bb1844
@gkulin
merge Daniels changes
884d7d7
@gkulin
fix errors
5031984
@gkulin
add fallback logic
6198ee1
@gkulin
wip - testing
edea0a1
@gkulin
Merge branch 'release/6.0.4xx' into downloadLinkChange
4a1e011
@gkulin
address feedback
d09086b
@gkulin
differentiate between installed feature band and feature band that wa…
97461cf 
…s passed in from command line
@gkulin
update logic involving installed feature band and update impacted tests
0baa592
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20220…
7273f09 
…713.13

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22329.30 -> To Version 4.3.0-3.22363.13
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20220…
d9efca3 
…713.19

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22329.30 -> To Version 4.3.0-3.22363.19
@v-wuzhai
Merge pull request #26569 from dotnet/darc-release/6.0.4xx-a258c81a-7…
4445b8b 
…2a3-4435-a4fe-b7ef36a200a7

[release/6.0.4xx] Update dependencies from dotnet/roslyn
@marcpopMSFT
Update Versions.props
a1105d4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2022…
e3891cd 
…0714.5

Microsoft.Build , Microsoft.Build.Localization
 From Version 17.3.0-preview-22330-02 -> To Version 17.3.0-preview-22364-05
@gkulin
address feedback, failing test and update logic involving installed f…
8ef250c 
…eature band
@dotnet-maestro
Update dependencies from https://github.com/dotnet/format build 20220…
68bea59 
…714.2

dotnet-format
 From Version 6.4.330901 -> To Version 6.4.336402
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2022…
005c532 
…0714.7

Microsoft.Build , Microsoft.Build.Localization
 From Version 17.3.0-preview-22330-02 -> To Version 17.3.0
dotnet-maestro bot and others added 14 commits July 14, 2022 22:16
@dotnet-maestro
Update dependencies from https://github.com/dotnet/format build 20220…
2b06182 
…714.1

dotnet-format
 From Version 6.4.330901 -> To Version 6.4.336401
@dotnet-maestro
Update dependencies from https://github.com/dotnet/format build 20220…
1153e19 
…714.3

dotnet-format
 From Version 6.4.336401 -> To Version 6.4.336403
@gkulin
remove unecessary checks and address test failure
63c57f0
@v-wuzhai
Merge pull request #26596 from dotnet/darc-release/6.0.4xx-1972fcee-f…
a4e5251 
…7a6-4e24-be3b-380271d3d4c3

[release/6.0.4xx] Update dependencies from dotnet/msbuild
@v-wuzhai
Merge pull request #26597 from dotnet/darc-release/6.0.4xx-3fcc6da4-0…
4b0c215 
…237-4c4c-a789-21d2b2777ed5

[release/6.0.4xx] Update dependencies from dotnet/format
@gkulin
reimplement checks
fdbe870
@gkulin
address feedback
1f754fc
@gkulin
skip remaining failing test
01d1e6f
@marcpopMSFT
Merge pull request #26369 from gkulin/downloadLinkChange
52a29bc 
Allow dotnet workload update print-download-link-only to use fallback and work with prior SDK versions
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20220…
6b5c1b6 
…715.7

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22363.19 -> To Version 4.3.0-3.22365.7
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20220…
b12a972 
…715.10

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22363.19 -> To Version 4.3.0-3.22365.10
@v-wuzhai
Merge pull request #26629 from dotnet/darc-release/6.0.4xx-dbd084ce-e…
0c31d79 
…eb7-4fbb-9816-d82b10e18e28

[release/6.0.4xx] Update dependencies from dotnet/roslyn
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2022…
a67cb3f 
…0721.2 (#26750)

Microsoft.Build , Microsoft.Build.Localization
 From Version 17.3.0 -> To Version 17.3.0

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@v-wuzhai
Merge branch 'release/6.0.4xx' into Jason/Merge604xxToMain
3e187f6
@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@v-wuzhai v-wuzhai requested review from gkulin and marcpopMSFT July 26, 2022 09:30
@v-wuzhai
Copy link
Member Author

@gkulin I've resolved the conflict, could you help to review them?

@marcpopMSFT
Copy link
Member

@joeloff @gkulin There's one test failure in this codeflow: Microsoft.DotNet.Cli.Workload.Install.Tests.GivenDotnetWorkloadInstall.GivenWorkloadInstallItTreatsPreviewsAsSeparateFeatureBands

Looks like the test end ups triggering a null exception in the releases library so adding both of you.

System.ArgumentNullException : Value cannot be null. (Parameter 'input')

Stack trace
at Microsoft.Deployment.DotNet.Releases.ReleaseVersion.Parse(String input)
at Microsoft.Deployment.DotNet.Releases.ReleaseVersion..ctor(String version)
at Microsoft.NET.Sdk.WorkloadManifestReader.SdkFeatureBand..ctor(String version) in //src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkFeatureBand.cs:line 14
at Microsoft.DotNet.Workloads.Workload.InstallingWorkloadCommand..ctor(ParseResult parseResult, IReporter reporter, IWorkloadResolver workloadResolver, IInstaller workloadInstaller, INuGetPackageDownloader nugetPackageDownloader, IWorkloadManifestUpdater workloadManifestUpdater, String dotnetDir, String userProfileDir, String tempDirPath, String version, String installedFeatureBand) in //src/Cli/dotnet/commands/InstallingWorkloadCommand.cs:line 73
at Microsoft.DotNet.Workloads.Workload.Install.WorkloadInstallCommand..ctor(ParseResult parseResult, IReporter reporter, IWorkloadResolver workloadResolver, IInstaller workloadInstaller, INuGetPackageDownloader nugetPackageDownloader, IWorkloadManifestUpdater workloadManifestUpdater, String dotnetDir, String userProfileDir, String tempDirPath, String version, IReadOnlyCollection`1 workloadIds, String installedFeatureBand) in //src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs:line 46
at Microsoft.DotNet.Cli.Workload.Install.Tests.GivenDotnetWorkloadInstall.GivenWorkloadInstallItTreatsPreviewsAsSeparateFeatureBands() in //src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs:line 413

@v-wuzhai
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@v-wuzhai
Copy link
Member Author

@gkulin It seems that the test is still failed

@v-wuzhai v-wuzhai merged commit 9cbd68c into main Aug 3, 2022
@v-wuzhai v-wuzhai deleted the Jason/Merge604xxToMain branch August 3, 2022 05:10
radical added a commit to radical/runtime that referenced this pull request Aug 5, 2022
@radical
Wasm.Build.Tests: re-enable building with latest sdk
af64a00 
The sdk issue dotnet/sdk#26967 was fixed in
dotnet/sdk#26796 .

Fixes dotnet#73312 .
@radical radical mentioned this pull request Aug 5, 2022
Merged
radical added a commit to dotnet/runtime that referenced this pull request Aug 5, 2022
@radical
Wasm.Build.Tests: re-enable building with latest sdk (#73423)
dafc6df 
The sdk issue dotnet/sdk#26967 was fixed in
dotnet/sdk#26796 .

Fixes #73312 .
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joeloff joeloff joeloff approved these changes

@gkulin gkulin Awaiting requested review from gkulin

@marcpopMSFT marcpopMSFT Awaiting requested review from marcpopMSFT

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@v-wuzhai @marcpopMSFT @joeloff @gkulin